build: Fix the build without documentation

Just key everything of gtk-doc.

diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index 58aa6769a303c542bc2dd44bbff48fc5c111d580..56ca4f59d85344b158e6f7f2ed3c6ac7bbcbe26d 100644 (file)
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -89,5 +89,3 @@ ostree_SOURCES += \
 ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
 ostree_LDADD += $(OT_INTERNAL_SOUP_LIBS)
 endif
-
-MANPAGES += doc/ostree.1

diff --git a/Makefile.am b/Makefile.am
index 67fb6b9fa611ffcd9d58f96f130c031437974c40..bcd28e5bac3a8fab3a46284417a029e9d2a8200d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ endif
 
 SUBDIRS += .
 
-if BUILD_DOCUMENTATION
+if ENABLE_GTK_DOC
 SUBDIRS += doc
 endif
 

diff --git a/configure.ac b/configure.ac
index 23f2cc1af95efd823e3683caf83bb5324230c238..549235137259015952c195eb223b65b32696f602 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -83,18 +83,8 @@ AM_CONDITIONAL(BUILDOPT_INTROSPECTION, test x$found_introspection = xyes)
 
 LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"
 
-AC_ARG_ENABLE(documentation,
-              AC_HELP_STRING([--enable-documentation],
-                             [build documentation]),,
-              enable_documentation=yes)
-AS_IF([test x$enable_documentation = xyes], [
-   AC_PATH_PROG([XSLTPROC], [xsltproc])
-   AS_IF([test x$XSLTPROC = x], [
-      AC_MSG_ERROR([xsltproc is required to build documentation])
-   ])
 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
-])
-AM_CONDITIONAL(BUILD_DOCUMENTATION, test x$enable_documentation = xyes)
+AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 AC_ARG_WITH(libarchive,
            AS_HELP_STRING([--without-libarchive], [Do not use libarchive]),